56344960743cb3778512d0b91c2a6165736d5e86,modules/apps/forms-and-workflow/dynamic-data-mapping/dynamic-data-mapping-test/src/test/java/com/liferay/dynamic/data/mapping/util/DDMFormValuesMergerTest.java,DDMFormValuesMergerTest,testMergeAddLocaleTextDDMFormValues,#,49

Before Change


	public void testMergeAddLocaleTextDDMFormValues() {
		String text = RandomTestUtil.randomString();

		LocalizedValue textValue = new LocalizedValue();

		textValue.addString(LocaleUtil.US, text);

		DDMFormValues textFormValues = createTextDDMFormValues(
			"text", textValue);

		String textTranslator = RandomTestUtil.randomString();

		textValue = new LocalizedValue();

		textValue.addString(LocaleUtil.US, text);

		textValue.addString(LocaleUtil.BRAZIL, textTranslator);

		DDMFormValues newTextFormValues = createTextDDMFormValues(
			"text", textValue);

		DDMFormValues mergeFormValues = _ddmFormValuesMerger.merge(
			newTextFormValues, textFormValues);

		List<DDMFormFieldValue> ddmFormFieldValues =
			mergeFormValues.getDDMFormFieldValues();

		testValues(ddmFormFieldValues, LocaleUtil.US, text);
		testValues(ddmFormFieldValues, LocaleUtil.BRAZIL, textTranslator);
	}

After Change



	@Test
	public void testAddMissingLocaleToExistingDDMFormFieldValue() {
		DDMForm ddmForm = DDMFormTestUtil.createDDMForm();

		ddmForm.addDDMFormField(
			DDMFormTestUtil.createTextDDMFormField("text", false, false, true));

		// Existing ddm form values

		String enStringValue = RandomTestUtil.randomString();

		LocalizedValue existingLocalizedValue =
			DDMFormValuesTestUtil.createLocalizedValue(
				enStringValue, LocaleUtil.US);

		DDMFormFieldValue textDDMFormFieldValue =
			DDMFormValuesTestUtil.createDDMFormFieldValue(
				"text", existingLocalizedValue);

		DDMFormValues existingDDMFormValues = createDDMFormValues(
			ddmForm, textDDMFormFieldValue);

		// New ddm form values

		String ptStringValue = RandomTestUtil.randomString();

		LocalizedValue newLocalizedValue =
			DDMFormValuesTestUtil.createLocalizedValue(
				enStringValue, ptStringValue, LocaleUtil.US);

		textDDMFormFieldValue = DDMFormValuesTestUtil.createDDMFormFieldValue(
			"text", newLocalizedValue);

		DDMFormValues newDDMFormValues = createDDMFormValues(
			ddmForm, textDDMFormFieldValue);

		DDMFormValues mergedFormValues = _ddmFormValuesMerger.merge(
			newDDMFormValues, existingDDMFormValues);

		List<DDMFormFieldValue> mergedFormFieldValues =
			mergedFormValues.getDDMFormFieldValues();

		Assert.assertEquals(1, mergedFormFieldValues.size());

		DDMFormFieldValue mergedDDMFormFieldValue = mergedFormFieldValues.get(
			0);

		Value mergedValue = mergedDDMFormFieldValue.getValue();

		Assert.assertEquals(
			enStringValue, mergedValue.getString(LocaleUtil.US));
		Assert.assertEquals(
			ptStringValue, mergedValue.getString(LocaleUtil.BRAZIL));
	}